Remove some unused variables.

2006-04-11  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktextview.c (selection_motion_event_handler): Remove
        some unused variables.

        * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply
        a patch from David Trowbridge to improve the positioning of the
        search popup.  (#338047)

diff --git a/ChangeLog b/ChangeLog
index 93488b13fff0e190fe720fa2910e9aab6ace5fc0..0a673b92be7b7769c9cd3623867751d702a18d64 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextview.c (selection_motion_event_handler): Remove
+       some unused variables.
+
+       * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply
+       a patch from David Trowbridge to improve the positioning of the
+       search popup.  (#338047)
+
 2006-04-11  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
        * gtk/gtkrecentmanager.c (gtk_recent_manager_init)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 93488b13fff0e190fe720fa2910e9aab6ace5fc0..0a673b92be7b7769c9cd3623867751d702a18d64 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2006-04-11  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktextview.c (selection_motion_event_handler): Remove
+       some unused variables.
+
+       * gtk/gtktreeview.c ((gtk_tree_view_search_position_func): Apply
+       a patch from David Trowbridge to improve the positioning of the
+       search popup.  (#338047)
+
 2006-04-11  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
        * gtk/gtkrecentmanager.c (gtk_recent_manager_init)

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 43a2ec5df261e0d8c6601c51df7b611c5a45a1bc..c8004f915cdca9579850a4288f95f8ad552a8558 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -5637,8 +5637,6 @@ selection_motion_event_handler (GtkTextView    *text_view,
     }
   else 
     {
-      gint x, y;
-      GdkModifierType state;
       GtkTextIter cursor, start, end;
       GtkTextIter orig_start, orig_end;
       GtkTextBuffer *buffer;

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 8708553ad999231638d779512cdefe73a1572975..22e80d3a6d48b6224da0bc32c16f5d5423ac4348 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12766,14 +12766,14 @@ gtk_tree_view_search_position_func (GtkTreeView *tree_view,
                         &tree_height);
   gtk_widget_size_request (search_dialog, &requisition);
 
-  if (tree_x + tree_width - requisition.width > gdk_screen_get_width (screen))
+  if (tree_x + tree_width > gdk_screen_get_width (screen))
     x = gdk_screen_get_width (screen) - requisition.width;
   else if (tree_x + tree_width - requisition.width < 0)
     x = 0;
   else
     x = tree_x + tree_width - requisition.width;
 
-  if (tree_y + tree_height > gdk_screen_get_height (screen))
+  if (tree_y + tree_height + requisition.height > gdk_screen_get_height (screen))
     y = gdk_screen_get_height (screen) - requisition.height;
   else if (tree_y + tree_height < 0) /* isn't really possible ... */
     y = 0;